projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cf7961 cc49e1c)
bitkeeper revision 1.1236.1.144 (42484459vNunHVt3PY-Uy-M3JRd0yw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 28 Mar 2005 17:52:25 +0000 (17:52 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 28 Mar 2005 17:52:25 +0000 (17:52 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/mtrr/generic.c patch | diff1 | diff2 | blob | history
xen/arch/x86/mtrr/main.c patch | diff1 | diff2 | blob | history
xen/arch/x86/smpboot.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/mtrr/generic.c
Simple merge
diff --cc xen/arch/x86/mtrr/main.c
Simple merge
diff --cc xen/arch/x86/smpboot.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.